iconGrid: Properly remove pages

When the last item of an IconGridLayout page is removed,
the page itself is removed too. However, the indexes of
items of next pages are not updated, which mess up the
layout manager state.

Update the page index of the items at forward pages when
removing a page.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1406

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 2d3a17a6261dd5a95164274e32883cb99968c7a1..12a4aed9bd6ddb5935aadeb8dfb1fff9306aed61 100644 (file)
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -468,6 +468,12 @@ var IconGridLayout = GObject.registerClass({
             this._unlinkItem(item);
         });
 
+        // Adjust the page indexes of items after this page
+        for (const itemData of this._items.values()) {
+            if (itemData.pageIndex > pageIndex)
+                itemData.pageIndex--;
+        }
+
         this._pages.splice(pageIndex, 1);
         this.emit('pages-changed');
     }